Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Sun, 28 Mar 2010 13:04:11 +0000 (09:04 -0400)
committerEli Zaretskii <eliz@gnu.org>
Sun, 28 Mar 2010 13:04:11 +0000 (09:04 -0400)
1  2 
src/Makefile.in
src/dispextern.h

diff --cc src/Makefile.in
Simple merge
Simple merge